[ARM] Change the type of CC and VCC code in splitMnemonic.
#83413
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mc @llvm/pr-subscribers-backend-arm Author: Alfie Richards (AlfieRichardsArm) ChangesThis changes the type of Full diff: https://github.com/llvm/llvm-project/pull/83413.diff 1 Files Affected:
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 37bfb76a494dee..dd6c637a6fa2a0 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -506,9 +506,10 @@ class ARMAsmParser : public MCTargetAsmParser {
bool isMnemonicVPTPredicable(StringRef Mnemonic, StringRef ExtraToken);
StringRef splitMnemonic(StringRef Mnemonic, StringRef ExtraToken,
- unsigned &PredicationCode,
- unsigned &VPTPredicationCode, bool &CarrySetting,
- unsigned &ProcessorIMod, StringRef &ITMask);
+ ARMCC::CondCodes &PredicationCode,
+ ARMVCC::VPTCodes &VPTPredicationCode,
+ bool &CarrySetting, unsigned &ProcessorIMod,
+ StringRef &ITMask);
void getMnemonicAcceptInfo(StringRef Mnemonic, StringRef ExtraToken,
StringRef FullInst, bool &CanAcceptCarrySet,
bool &CanAcceptPredicationCode,
@@ -6283,10 +6284,9 @@ bool ARMAsmParser::parsePrefix(ARMMCExpr::VariantKind &RefKind) {
//
// FIXME: Would be nice to autogen this.
// FIXME: This is a bit of a maze of special cases.
-StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic,
- StringRef ExtraToken,
- unsigned &PredicationCode,
- unsigned &VPTPredicationCode,
+StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic, StringRef ExtraToken,
+ ARMCC::CondCodes &PredicationCode,
+ ARMVCC::VPTCodes &VPTPredicationCode,
bool &CarrySetting,
unsigned &ProcessorIMod,
StringRef &ITMask) {
@@ -6340,7 +6340,7 @@ StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic,
unsigned CC = ARMCondCodeFromString(Mnemonic.substr(Mnemonic.size()-2));
if (CC != ~0U) {
Mnemonic = Mnemonic.slice(0, Mnemonic.size() - 2);
- PredicationCode = CC;
+ PredicationCode = (ARMCC::CondCodes)CC;
}
}
@@ -6387,7 +6387,7 @@ StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic,
unsigned CC = ARMVectorCondCodeFromString(Mnemonic.substr(Mnemonic.size()-1));
if (CC != ~0U) {
Mnemonic = Mnemonic.slice(0, Mnemonic.size()-1);
- VPTPredicationCode = CC;
+ VPTPredicationCode = (ARMVCC::VPTCodes)CC;
}
return Mnemonic;
}
|
This changes the type from `unsigned` to `ARMCC::CondCodes` for clarity and correctness.
AlfieRichardsArm
force-pushed
the
change-cc-and-vcc-type
branch
from
28ce7d8 to
bc43e2d
Compare
|
Note the failing test is not relevant, seems to be a timeout or similar |
|
I will wait a couple days for external code review |
|
@s-barannikov I've added you as a reviewer as this commit is a prerequisite for some optional operands work that I will submit in coming days and I see you have worked on the same area. |
s-barannikov
approved these changes
Feb 29, 2024
| @@ -6340,7 +6340,7 @@ StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic, | |||
| unsigned CC = ARMCondCodeFromString(Mnemonic.substr(Mnemonic.size()-2)); | |||
| if (CC != ~0U) { | |||
| Mnemonic = Mnemonic.slice(0, Mnemonic.size() - 2); | |||
| PredicationCode = CC; | |||
| PredicationCode = (ARMCC::CondCodes)CC; | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
The anchor link really changes the meaning of that link (:
I'll get a quick fix in
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
AlfieRichardsArm
force-pushed
the
change-cc-and-vcc-type
branch
from
55a6345 to
bf7bbb1
Compare
|
Failing test continues to be a seemingly unrelated failure regarding MLIR |
AlfieRichardsArm
force-pushed
the
change-cc-and-vcc-type
branch
from
0bc0eda to
a1cd51c
Compare
AlfieRichardsArm
force-pushed
the
change-cc-and-vcc-type
branch
from
a1cd51c to
bf7bbb1
Compare
|
After a fixing me pushing to the wrong branch this is back to what it should be. |
|
Test failure is unrelated MLIR test. Merging this now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes the type of
PredicationCodeandVPTPredicationCodefromunsignedtoARMCC::CondCodesandARMVCC::VPTCodesresp' for clarity and correctness.